Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 18 Jul 2010 22:30:24 +0000 (22:30 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 18 Jul 2010 22:30:24 +0000 (22:30 +0000)
commitae879d4f485895452b0dfba1e460db23970fea1d
treede2bcd1476bffc587b081004d6365967c5360eb3
parent2067745cd4748c736724129630b0a245cb2a79ba
parentcc648d9168d09121e4b3168f49795504f54c672e
Merge from mainline.